bitkeeper revision 1.1159.223.23 (41f2c9e33H5dJn6K7RN-o2UASMwI3Q)

Description: Use FHS-compatible paths

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk

diff --git a/tools/python/xen/sv/params.py b/tools/python/xen/sv/params.py
index 16b764f088b25c2229db60ece30015bbea05bb64..beed647a4fd3b0f47db9ce6e1893f38e15fa0142 100644 (file)
--- a/tools/python/xen/sv/params.py
+++ b/tools/python/xen/sv/params.py
@@ -1,3 +1,3 @@
 SV_PORT = 8080
-SV_ROOT = "/var/xen/sv/"
-PID_FILE = "/var/xen/sv.pid"
\ No newline at end of file
+SV_ROOT = "/var/lib/xen/sv/"
+PID_FILE = "/var/run/xen-sv.pid"

diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index c9cc9a22798678aee4da9e43248b01be0c720c5c..dea3eeeb2f6cbca7a524153e406b16625adb88a1 100644 (file)
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -20,7 +20,7 @@ class XendRoot:
     """Root of the management classes."""
 
     """Default path to the root of the database."""
-    dbroot_default = "/var/xen/xend-db"
+    dbroot_default = "/var/lib/xen/xend-db"
 
     """Default path to the config file."""
     config_default = "/etc/xen/xend-config.sxp"

diff --git a/tools/sv/Makefile b/tools/sv/Makefile
index a285dc15d535084e02168b917391d71ad83a5fc1..dc47b71e0909aa620b6663b044fb1ff37b9336a6 100755 (executable)
--- a/tools/sv/Makefile
+++ b/tools/sv/Makefile
@@ -1,4 +1,4 @@
-sv_insdir      := $(prefix)/var/xen/sv
+sv_insdir      := $(prefix)/var/lib/xen/sv
 INSTALL                = install
 INSTALL_DIR    = $(INSTALL) -d -m0755
 INSTALL_DATA   = $(INSTALL) -m0644